Merge "fix bug: typo in type."