Fix auto-assign heading feature