Fixed: bugs