Fixed the rendering issue completely