A little fix for keys