Improve hovering