Fix for bug #2237