bug1 resolved