Fixed issue with returning combat commands