Fix inconsistency in code
Merge branch 'hotfix'