added focus #fix #78 #188