Resolve issue #4