Fixes issue #44