[dannunzio] tried to simplify lock