fix from on main form
Merge branch 'dev'