See attached patch.

Andreas