fix tooltip bug
modify the code to match the staging file