Hotfix/issue 295 diagnose not working

Fixes the diagnose problem from the command line.