Fix highlighting issue
Merge branch 'hotfix/v1'