Fixes #344 Debug has incomplete information

For the feature branch