Fixed another problem with the arguments code