fix subscribes