Resolve issue #1.