fixes the focus issue of #137