Fix subscribitions