Questions hotfix