Fix for issue 2900