Fix for issue 2638