fixed flaw and security issue