Fixed command auto completion