ready to fix the return problem