#786 Repaird broken examples (2)