Fixing what I screwed up before.