Applied XTrace patch