[SWANcom] Indexing Error Update: A Workaround