Fixed the bug of auto-org-create