501 party foul

Resolves #501, see #750 

<!---
@huboard:{"order":906.0,"milestone_order":770,"custom_state":""}
-->