See attached patch.

--
Jiri