Fix for bug #3028