Security fixes #2!