fix/active-pool