focus bug fixed again