finished implementing label fix for roundtrips