Experimental fix for the motor connect bug.