Fixed call star caller and callee problem