added another safety