Fix crash after adding comments