hotfix on semantic analysis