Fixes a bug
Adds security