resolve issue #2010