Small changes to make sure args is cleared each time