fixed 'return forward'