Fix comment cutting issue