compilation fix from bad merge