Fix: batch on !maps?