fix for exchange clean_arguments