Another untested commit to fix an issue. (I'm lazy.)