add suggested fix on issue #25