Fix -a and remove redundant command