fixed focus bug
Merge branch 'anton'