Handle OnSubscribeFuncs correctly