Fixed, now works both ways, but is ugly and it should support name updates.