update to issue #10