Bug 28 29 30 resolve