Fix subscribe design