added shim for query