Fix for issue 2685