Rebase Renaud's fix