fixed #3487
Merge branch '#3487'
Merge pull request #19 from pipu/#3487

fixed #3487