Fixes issue #47