Added safeguards