Fix loop in subscription