bug fix of return