Fix for issue 1538