Fixed type error.
Merge branch 'develop'