MX-1217 avoid creating duplicate commands