more first fix