Fixing #1059 and #888 and (again) #972