Same name different ds

Fixes #513