Fixing Issue 686: Tooltip bug