Comments repair, from Alex Stangl