I8 lazy load fix from Zack