Fix amount calculation
Merge branch 'develop'