Fixed: Code Issue