Add Debug Mode close issues #1