ah okay. but honestly, I would rather like it to be changed there (for example using map) since it is more clear to read it without the defined() don't you think?