[20602] Fix issue #31