Fixed return value passing