changes of fixing bugs