Fixing tooltip issue