Fix #1
Security work