Fixing debug mode V