Feature/sentence fix