Fix for issue 5572