Fix commandArgs