Fixed bugs ...