Subscribe fix