little untested fix on focus again