Better build! Fixed empty tooltips