Avoid flickering of the tooltip
Fix merge