Fix issue #2010