Temporary fix to resolve some transforms before rendering