fix for keys v20