Observable fire fix