TEIID-2455 expanding the earlier fix