Revert "Call fix"

This reverts commit 288a58852d16f37b4436dd1e016b9fb525221e3b.