Fix issue with trailing comments