Fixes issue #61