fixed render multiple issues