Fire fix from Mloc