Sorry, the patches don't compile - I mixed 2 different versions.
Apply the attached patch on top.

--
	MAnfred