#18 
Hover related bug fixed