Yeah, i agree and considered that but didn't want to make the workaround too heavy so unless there is strong concern here I would leave it as is.