Issue #2006