A little fix for a problem with keys