Try other approach to fix issue #15334.