Fix query (#445)