Temporary fix for tooltip issue