Re #7311 Fix submision issue