Weird, but this fixes a new bug. I'm gonna re-implement.