Sammie Solorio lock-fix4418