Change to match new stack traces