Corrects WindowFunction handling
Merge pull request #393 from mdrillin/TEIIDDES-2269

Corrects WindowFunction handling