Fixed: update bugs