resolve issue #10