tidied up tuple namespace fix