solve bug 1501
Merge pull request #251 from opto/id1501

solve bug 1501