MT#6745 add fix for usrloc