Fix for bug #1020066