Little improve of security