Fixed remove in disconnect