Merge pull request #1063 from galderz/t_total_fee_999