TEIID-2721 fix for using the wrong columns