change to simple return to prevent stack overflow