fix fee calculation
Merge pull request #686 from achamely/master

Fix fee calculation