some fixes concerning subscription