Fix hover events

(I messed up the previous merge with origin/master)