fix some more instances of that bug