Fix for bug #1935