Fix for issue 4547