fixed render with conditional