Hotfix for comment crash bug