Bug 3 fixed.