dupa fixes #1