fix logic, finally.