FIX: wrong client-clean-up after accept