bug 2 fixed