Minor issue: changed some code tracing