Fix Render issue