fix the future lock issue