fix id64 handling