Added @rfouilloux patch