Make sure fee callbacks happen first

Change-Id: I01dbfff83907e32d3908fe8e653acd1780a1794a