these fixes will never finish