fixing question switching