Fixing comment crash