Fixing bugs ...