Resolve issue #222