Fix to stack traces (fix to fix earlier today)