FIX::performence improvement