Fix not return bug