Added a small safety feature