Fix #342 Originating stack traces are properly set