Fixing debug mode IV