Handle 1 comment too

Great job Mark

Change-Id: Ibba3b1cf46013b45dadd441e0b19a368c8d746bb