Fix for bug #3010