Some changes to check the failure