Same change as the command_mode one could be made here if you want.