From #333 to #444. And now hover works properly