fixing issue #20