#1 - fixed but with neverseen comments happening twice