Bug 1 fixed.