Bug1 2 4 resolve