Upgrade to axon 2.3