Fixes issue #53