Solve policy issue