Should fix (please try) #406