fixing bugs ...