fix for KeyedTuple issue. WIP