Fix mistakes v.4