Kristofer Valenzuela lock-fix8477