Fixed for changes to linqjs