Fix issues #7342 #7343