resolve issue #2136