Fixing security vulnerabilitie... Note