Fix reported by J. Fanjul
Additional comments