[UP] Adjust redundant logic.