Fix Subscribe()