following previous commit, missed a few places