Fix for bug #2459