Fixed issue #2009