Fixes issue #58