fix (ahem) #582