Reset fees before calculating/adding them again

Fixes #6090

@claudiosmweb Do you see any issues with this?