V6.2 Debug issue changes