some changes fix it for work to v.0.5.7