diff --git a/ArmnnPreparedModel.cpp b/ArmnnPreparedModel.cpp
index d095e41..f990d3b 100644
--- a/ArmnnPreparedModel.cpp
+++ b/ArmnnPreparedModel.cpp
@@ -294,7 +294,7 @@
 {
     std::vector<std::vector<char>> storage;
     armnn::InputTensors inputTensors;
-    for (unsigned int i = 0; i < m_Model.inputIndexes.size(); i++)
+    for (unsigned int i = 0; i < getMainModel(m_Model).inputIndexes.size(); i++)
     {
         const armnn::TensorInfo inputTensorInfo = m_Runtime->GetInputTensorInfo(m_NetworkId, i);
         storage.emplace_back(inputTensorInfo.GetNumBytes());
@@ -304,7 +304,7 @@
     }
 
     armnn::OutputTensors outputTensors;
-    for (unsigned int i = 0; i < m_Model.outputIndexes.size(); i++)
+    for (unsigned int i = 0; i < getMainModel(m_Model).outputIndexes.size(); i++)
     {
         const armnn::TensorInfo outputTensorInfo = m_Runtime->GetOutputTensorInfo(m_NetworkId, i);
         storage.emplace_back(outputTensorInfo.GetNumBytes());
@@ -349,4 +349,10 @@
 template class ArmnnPreparedModel<hal_1_1::HalPolicy>;
 template class ArmnnPreparedModel<hal_1_2::HalPolicy>;
 #endif
+
+#ifdef ARMNN_ANDROID_NN_V1_3
+template class ArmnnPreparedModel<hal_1_1::HalPolicy>;
+template class ArmnnPreparedModel<hal_1_2::HalPolicy>;
+template class ArmnnPreparedModel<hal_1_3::HalPolicy>;
+#endif
 } // namespace armnn_driver