Fix issue #2011