Possible Closurequery final fix