Resolve issue #71