fix MAP-INTO performance