fixes to tagged class