Fix for bug #2550