#341. Added security code