Fix self lock issue