Try #3 to fix the issue #20.