Fixes issue #57