Fix for bug #2287