Fix subscribe bug