FIX: bug in Analysis, CHANGE: better handle of debug mode

Change-Id: Idd190bc79ac8a02febd96d9d9759e5d5f85c043b