Close GH-861: Bug/callstack gh 860. Fixes #860