subscribe only if needed

@samshull @hsume2