resolve issue #1