Ticket381

Fix batching for existing modules.