Fixed further problems with rendering