remove the query call to avoid block