repair subscribe handling