allowing  replacement in more cases