Fixes issue #5554