bug 1 in 1 fixed