Fix client not copying all keys over