Fixing issue #23. Plugs a security hole.