Attempting to fix invalid choice bug