Bug 5 fixed.