7d5f74f within-first-run-issue