DDG: bugfix