Fixed a TypeError
Merge pull request #2781 from ychouinard/develop

Fixed a TypeError