Damian Candelaria lock-fix5169