Alfred Carrillo lock-fix6655