Bug 907052 - Fix the lack of bug 900159