Ugly modification to secure initialization

Ugly modification to secure initialization