Second fix bugs