Fix bug #68133 and bug #68135