Fix redundant command creation