fix for keys