Fix one bug from last commit. Other bug is broken TCO.