ddd fixes #1