Questions fix