Fix logic, temporary