Added critical security/safety feature