TEIID-1543 covering offset as well