Fix for bug #3003