Fix Query.exec