Fix machine switch for type entity counter