Analytics incorrect amount

Fixes #1014
Merge pull request #1021 from misulicus/patch-16

Analytics incorrect amount