Fix for bug #2434