fix focus

please include in the 6.0 release