Possible Closurequery fix