Fixed overzealous search/replace