Hotfix on comments