Added safeguard.