Fixed: Nesting and logic