Fixes issue #269