Orientation switch alignment fix