Hotfix on answer check