Fix user choice logic