Resolve issue #6