Update interface to match with the implementation.
Merge pull request #1611 from kayue/patch-19

Update interface to match with the implementation.