Democracy 3 - fixes #935