added another security check