Resolve issue #3