Fix bug caused by a refactoring
Merge branch 'tz-hover-fix' into tz-staging