Fix #96  with Benjamin Cartereau