first fix attempt