Fixes issue #281