Fix generation changing unrelated blocks