Added output trace patch. Just for testing.