Fix #20
Check old comments