simplified the previous fix for #64359