Rendering fix attempt #2