Fixed #68: Batch saving is broken since 2.5.x