Fix for bug #3008