Fixes issue #903