Second fix attempt