Troubleshooting tweak