Get rid of subscribe override