fixed #57, but this time for real