Dirtier version of Philippe patch