Use suitable type.
Merge pull request #2686 from cubicdaiya/use-suitable-type

Use suitable type.