Argument handling bugfix