Fix fail with manual queries