Fix major bug
Fix minor bug