Added size field check