Fixed further render problems