fix ACT-1428
Merge pull request #33 from smirzai/act-1499

fix ACT-1428