Repaire for only main command