Attempted to fix Endgame *again*