Hi @anthonys,
never had this issue but a quick search on the web shows that this is a limitation of firestore itself.
So you workaround will most likely not prevent the bug from happening:
It seems as if you should store it in a dictionary if possible.