Fix PR14207, thanks ryanc