refactor fix for #14393