Update for better log trace.