Fix for onetime donation validation
Merge branch 'hotfix/0.3.1'