Fixed: Bug