Fix for bug #2554