That is indeed a cleaner way to solve this. I shall have a look at this today.