fixed the 'return problem'