Repairing the epic fail