automatic comment insertion, fixes #13