TRACE at the right place

TRACE at the right place