Fixes #10. Added explicit focus addition