Resolve issue #7