Gabriele Camara lock-fix1385