Debugging code tweak