Fixing logic, but for realzies this time