TROIA-366
Small fix
Merge pull request #85 from ipeirotis/ISSUE-83

TROIA-366 - fixes Issue #83 for BatchDS