Defer render fix bugs