Changed the args handling