fix bad merge from Marc Sladek