Mohammed Lamarr lock-fix2295