Fixed a target mismatch problem in return calls