fixed tooltip
Merge branch 'dev'