Handle position wasn't being properly calculated when zoomed in
Merge branch 'master' into css