applied patch from Duong-Khang NGUYEN <neoneurone@users.sf.net>, which