Fix the rest logic for the arguments