Fix for issue 4875