Fix according to comments + English version