Fixed bug if event has nil fee
Merge branch 'develop'