Fixed auto-setup logic for cherry-plugin