Fix comment bugs

Solution by @hsk