Fix call stack