More attempts to fix the rendering issues