Fix for bug #2405