Bug1 fixed.