Resolve issue #2136