Fix issue #2012