fix for TC-1444
Merge pull request #225 from snieguu/master

fix for TC-1444