Yes, you're right.  I believe I've addressed this in the amendment below.