Corrected breakpoints don't work, fixed
Update tracing
Runtime check to avoid listener double registration