Tag: restore lost functionality