Fix bug on removing comment