adapt to latest silicium