address issue #10