fixed bug(Issue #124)