Fixed #11 with focus