Fix for non-initialised fields (some Type1 field does not contain these fields and this results in wrong values)