Fixed issue #2007