Hotfix

The important part is in `query()`