FX collision matrix fix