Fixes issue #62