Fixed recalculating BasePokemon national id on every call