fix no return issue