Previous bug was in two places.