fixed lock issue