Margarette Zapata lock-fix0325