Fix end estimation