Second fix,final