Fix #1574: fix examples
6 files changed