fix/simplifiy need-semantic check