Fixed (I hope) #1057