Early Access version 41

This bug was originally reported here: