Fixed hovering issues