Addresses #568
Merge pull request #571 from StevenRoddis/piratepartyfix

[PirateParty] Addresses #568