Feature/fix comment

Only create automatic comment when