Attempting to fix new rendering on produciton take 1