Fixed Command tab-completion