fix issue #20