Fixes #344 Debug has incomplete information
Merge pull request #515 from PaulBender/fix-feature-344

Fixes #344 Debug has incomplete information