Fixed: Bugs