Fix checking
Fix troubleshooting function