Resolve issue #123