Patch #2 for bad replacement