Fixes issue #353