Minor bug in argument handling