secure fix v.2