I don't remember exactly what was done in this commit anymore, so don't be discourteous
Почищу код позже...