HACKING - Try to fix Initial Rendering