Fix logic (again)