fix by Cyril Guilloud