Try #2 to fix the issue #20.