Fixed: Extra case