bugs fix
Merge branch 'SIM#1-Security'