User Choice alignment fix