Updated to get the trace source to log correctly.