temporary(or not) fix for null comments crash in the list