Merge pull request #488 from iamqizhao/master

Move callInfo into the right position