Fix: user our audio map engine