Resolve issue #1