Option menu selection fix