fixed render issues