[FIX]Fill data in any case when parsing