Merge pull request #809 from phasehq/fix/lockbox-view-counting