fix subscription bug