some bug was fixed