Corrected some code tracing issue-minor