Fix returning issue