next generation, fix render bug