Bug 17733 #2 fix