Fix having to tap connect twice.