Fix the trigger commands