Fixes issue #65