Switch to auto-binding