Some changes that may help you debug the problem.