Fixes issue #31