Fixes issue #284