diff --git a/classes/class-cli.php b/classes/class-cli.php
index 3d0f499e5..351925711 100644
--- a/classes/class-cli.php
+++ b/classes/class-cli.php
@@ -111,7 +111,7 @@ public function query( $args, $assoc_args ) {
 
 		$query_args['fields'] = implode( ',', $fields );
 
-		$records = wp_stream_get_instance()->db->query->query( $query_args );
+		$records = wp_stream_get_instance()->db->query( $query_args );
 
 		// Make structure Formatter compatible
 		foreach ( (array) $records as $key => $record ) {
@@ -212,7 +212,7 @@ private function csv_format( $array ) {
 	 * @return void
 	 */
 	private function connection() {
-		$query = wp_stream_get_instance()->db->query->query( array( 'records_per_page' => 1, 'fields' => 'created' ) );
+		$query = wp_stream_get_instance()->db->query( array( 'records_per_page' => 1, 'fields' => 'created' ) );
 
 		if ( ! $query ) {
 			WP_CLI::error( esc_html__( 'SITE IS DISCONNECTED', 'stream' ) );
diff --git a/classes/class-db.php b/classes/class-db.php
index 7dcc9e1e3..28cedd74c 100644
--- a/classes/class-db.php
+++ b/classes/class-db.php
@@ -198,4 +198,17 @@ function existing_records( $column ) {
 
 		return isset( $this->plugin->connectors->term_labels[ $column ] ) ? $this->plugin->connectors->term_labels[ $column ] : array();
 	}
+
+	/**
+	 * Helper function for calling $this->query->query()
+	 *
+	 * @see Query->query()
+	 *
+	 * @param array Query args
+	 *
+	 * @return array Stream Records
+	 */
+	function query( $args ) {
+		return $this->query->query( $args );
+	}
 }
diff --git a/classes/class-list-table.php b/classes/class-list-table.php
index 9579301ab..e57680820 100644
--- a/classes/class-list-table.php
+++ b/classes/class-list-table.php
@@ -204,7 +204,7 @@ function get_records() {
 			$args['records_per_page'] = $this->get_items_per_page( 'edit_stream_per_page', 20 );
 		}
 
-		$items = $this->plugin->db->query->query( $args );
+		$items = $this->plugin->db->query( $args );
 
 		return $items;
 	}