Fix for bug #2235