fix other code now broken by this whole thing...