Rendering fix part1