Fixed call flow bug.