i need to test these fixes