fix 1580
Merge pull request #1718 from quizywiz/fixing1580

fix #1580