paper exploit fixes.
Merge pull request #1237 from ESwordTheCat/paper_exploit_fix

paper exploit fixes.