Fix the major bug risk
Merge pull request #19 from laupiFrpar/fix-issue-18

Fix the major bug risk