fix subscribe