continue fixing bugs ...