Breakage due to CallStack refactoring