Tried fix, moved handlers to field wrapper
Merge pull request #30 from Earth4/master

Focus fixed