Fixing logic ...