Please try patch I've enveloped. And write me does it fix your problem?

-- 
	- Cyrill