Fixes issue #37