added a bit of stack tracing
merge