#60 hopefully finally fixed