Fix call chain

Fixes #1891