Fixing Disputes

Fixes #969 and #968