Ooops. I screwed up on part of John's fixes. Sorry.