Patch attached.

--Bartosz