(DI-1908) Troubleshooting