501 party foul

Resolves #501, see #750