fix condition OR no return