fix #484
Merge pull request #488 from yushijinhun/working

fix #484