See the attached patch.

Rudy