Fixed Rendering Issue