correction issue #20