Fix a bug where arguments are not properly retained