fixed comment duplications (for real this time?)