Disputes

Fixes #914