Fix all command to prepare command exec