refix ZSS-654
Merge pull request #36 from RaymondChao/refix-ZSS-654

refix ZSS-654