(@ #704 and #703) fixed issue with batch and future calls