Here is a fixed patch, I had rebased incorrectly. Thanks again!

- John