TOS Rendering finally fixed