Applying Istvan's fix

--HG--
extra : source : f3a12b2da2ad2c8e2693c3ebfaf3c92334f89539