[20601] Fix issue #29