Fixes issue #258