fix subscriber generation macro