[DF-1236] fixed.
[DF-1236] Windows fix.
Merge pull request #222 from adebt/development_DF-1236

DF-1236 fix.