Fix for bug #2492