Fix the major bug risk

Fixes #18