TEIID-2207 improving check