Issue/1356 batch calls issue

Fix #1356