10140806 0958 fixes