Better fix for bug 11390 :p