Fix comment mapping, v0.0.2