fixing, by Slava comments