[Bug Fix] Flags dropped on end-game not removed