Fixed some hardcoding that *someone* didn't tell me about, which revealed a slight error I had to fix.