Fixed return problem