Fix for bug #2275