Fix for bug #2119