Oops. Bad cut and paste in last commit

Here's the working version.