Fixed Tiepo #1601
Merge pull request #1602 from ryanehamil/patch-2

Fixed Tiepo #1601