Add additional protection