fixed lock managment