Fix #16 cleaning issue killing subscribers