better subscription fix