fixed auto inclusion of Commands