Fixed: control flow