Fix Supports connect 3.0