Fix one bug bring up another.