Fixes issue #60