resolve issue #2