Fix support for internal trace