Mathew Newdegate lock-fix3744