Issue #1610 - fix ODUG extract