Fix: batch for !maps?