fixed conditional in onFocus