Fix issue batch-1952
Merge pull request #146 from baumgartner/fix-batch-1952

* BATCH-1952:
  Fix issue batch-1952