Fixing debug mode II