Fix for bug 1005151