TEIID-2327 adding another mask to ensure ordering is effective