Fixed autoFix replacement mechanism