Bug 8251 fix