Fix for issue 2703