Fixing the tooltip madness :dart: