Fixed not sorting commands