System mapper fix