Lucio Blomfield lock-fix2439