finish fix up in aabdd2969aa5430614a1c1bfe249a88aca7e8fdd