Fix after Vitaliy & Nastya review