Bug1 fixed