Command subscription fix