Fix for bug #3034