Forgot a couple of cases in the previous commit