fixed subscribe / unsubcribe bugs