Fix RETURN macro usage