Fix a regression in auto-align switch