Fix for ArmadaMarkets