STUD-497: fixed regression issue
Merge pull request #4 from leafknode/STUD-497_regression-fix

[hotfix] STUD-497: fixed regression issue