Resolve issue #738