Fixed to support TAK v2