Try to fix keys distribution