IMP: Planning fixing render issue