added fix for suscribe