Fixes issue #49