Resolve issue #2.