Matevzs corrections before exchanged with manca and matic
Mojca check to 3.3.2