FWIW, that's how I was getting ready to fix the code, but the name of the utility function should probably change as well (no pun intended)