HotFix of #55 Party mayhem