Fix for bug #2553