improve additionalData check