Fix to previous commit. Forgot to modify several more files with the same mistake