Fixed issue in determing choice