fixes #1536
Merge pull request #1537 from UltCombo/1536

fixes #1536