maybe fixes issue #77