Fix record the *whole* trace...