Button Lock bug fix