Fix for bug #2129