Fix for issue #5513