Improve issue #20