hotfix on wrong comparison
Merge branch 'hotfix/2.0.16'