comments hotfix