Fix ExMa bug, add listener params to step fn